Some cleanup
Last bit of cleanup for now