cleaned up db and views