Cleaning house a little
Updating to formotion 1.5.0 now that my PR was accepted and removing old code