Remove dependency on framework bundle