Removed unused code again