Temporary fix clean