Removing unsued stuff for now