cleaning up class references