removed unncessary things