Removed many calls to built-in functions