Removed unused fields and usings, fixed comments.