removing unsued features, renaming aliases and cleaning up