delete classes
add singleton