Issue #2235983 by drkloc: Removing rest ws and views datasource