Clean up some things
WIP
WIP
WIP