Deletes unused code
Separates Helpers into separate class