Code cleanup
Testing finished, added rm command