Removed font
Cleanup for class
Cleanup for class