Scripts cleanup