fixes cleanup