Cristian: removed epress, cleanup