Massive cleanup throughout