Adding support for C5.1 and adding script clean up alternatives