Removed NullComponents leak