Remove premature optimization