Cleanup - DB, Classes, switch and switchmethods