removed unneed things