Revert "Cleaning up"

This reverts commit d9a217903f012e51ec00ab35c54a5bfa3bcd2f65.