updates to expression pipeline and test, removed obsolete files