fix violations
remove old code