Uncalled methods removed, bugs fixed
Uncalled methods removed. Bug bixed