cleanup

Prior to addition of database structure and components