Finished cucumber on current using controller methods, remove some methods that are not using at the moment