Fixed misplaced comment and removed no longer used method