Removed custom scala support