Unwanted code removed