Clean up
Delete unused class