removed internal shortcuts as they were not test friendly