Remove conflicting code: gist