views extraction part 2
extraction cleanup