Cleanup + db migration added