Removed Unfunctional Features