Correctly name functions, remove old code and fix bezier solver