JavaScript cleanup...