removed all unecessary junk