largely removing previous commit