Fixes clean check, + cleanups.