Removing un-used method and variable