added additional code contracts

added additional code contracts and removed unused class