fixed a few warnings, removed unused properties