fix formatting and remove unused class