removed uncalled methods and condensed code