Merge "Removed unnecessary checks."