Remove database, some style fixes