Fixed the last few DRC violations; pruned unused outputs

Change-Id: I44f3fc6964ae403d5fe2c5e2bb26a3f8b5f7e77c