Fixing cleanup file so that the functions are being called