Unwanted code cleanup