APOLLO-3179 Removed intermediary class for testing