Removed redunant virtual methods
Some changes