Clean-up required: deleted everything not useful anymore