Cleanup
Removed handlers'