Huge clean up