removed unused stuff
added some helping things