fixed warnings and removed unused classes