Removed old code from helpers