Added copyright notice and removed last few unused properties