Removed not in use code, and fixed description showing bug