Removed some uneccessary dependencies from core application.