Some changes, and get rid of the unneeded stuff