Removed unecessary Extension methods