Fixed highlight feature
Cleanup, deleted internal stuff