Working on cleaning bugs up and remove some unused empty controller files