Fix obvious derp
Remove obsolete methods