More cleanup

- Removed clustering