Removed useless NULL checks