Removed unused code and made auto properties