Initial clean up of sap.js