Added LibraryController + Cleanup