Removed additional checks in onCreate