Massive cleanup and update