Remove dead sonic initial positioning; minor cleanup