Removed not necessary null checks