More clean up; fixed missing autoloads
Removed org-mode since I don't use it anymore