cleaned up references/packages