Removed stuff that is obsolete because of evil mode