remove old cruft
remove separate requirements till requirements are more stable