cleaned up. added switch to drop database