Remove unneeded private method and code cleanup