remove fixed function calls, clean up.