TODO-RELEASE: cleaned up, not really maintained lately