added comments and re-moved unused field