Removed unused code as clean-up