Moved left-overs from application module.