cleanup of old methods