Cleanup

Throw out old API (should syntax) and stuff