Removed additional unused code