Removed unnecessary includes in database