Merge "Removed obsolete opencore related comments"