Celise cleanup