Removed unmodular code