removed unused classes, some changes in the build plan