Rebuild

Cleaning up some stuff