Removed unused code...