Removed unused code. Source format