Finally clean this mess