Cleanup unused files and tables
Remove one level of nesting