Patch 1

So, just remove those and merge.