not used anymore
cleanup, resolved issues