Removing obsolete classes, commit hook update