Removed unused code and logic.