Removing unused things from scalap.
Merge pull request #2773 from folone/no-scalax

Cleanup of scalap.