Clean up system views and regression tests