Cleanup and rest-fix