Start to add in cleanup