Removed unused (old) code