Clean up

Clean up unused class