Removed unnessasery stuff