Removed selection delay
Cleanup