Removed unused code..