Started removing the unneccessary controls module