The first working version
Delete unused classes