massive cleanup & update