cleanup and switch to pyephem