cleanup core extensions

@bokmann
 - remove unnecessary include (adds namespace we do not need)
 - rename method that could collide with other monkey-patches