Remove database stuff, fix port.