Removing more code