Removed unwanted fields