Remove Database class