Removed unused code 2