Try to clean up this mess