Removed unwanted fields, bug fixes