cleanup ugly embeddded path hacks