More clean up, still doesn't fully work