Team garbage collection

-fixed migrations
-cleaned up existing code as a team