Cleanup

Please check and merge if it's ok.