Removed unecessary/unused parts.