A little bit of cleanup. Going to try and re-add the custom users stuff next.