Removed debug code, added WHOAMI