Removed superfluous helper class