Removed uneccesary references and classes