Clean-up / simplify DROPing of skin