Removed some single code

- Tested and running
- lowered waiting times