Removed un-used file
Updated misc methods and fixed specs