Removed unncessary fields