Removed all the references to classes which are not used.