REmoved dependency to corelib-web