Less sleeping
Cleanup
Further cleanup