cleaned up class, removed dead code