Removed unused code....