More clearing progress

Slightly better clearing implemented. Still slightly wonky, and happens
instantly.