Removed unused code part