Cleaning up

- Some comments deleted