massive cleanup
req