Removed Unnecessary Functions