Clean up

Cleaning in progress, doing mini updates to avoid fatal ones