More clean up, still broken