Clean up code
Clean old database code (refectory and add them back later)
Remove old model testing