Removed Database Checks