Finished cleaning, prepared for merge-request.