started removing function calls