removing rm calls, not needed
cleanup additions