Cleanupu to reporting etc