Customerjs cleanup

another one related to #583