Added script skeletons
added cleanup functionality