Deprecated scala code removal