Removes context property and fixes some coments