Bye Bye Protekk

Change-Id: I031c85a3f3ac49dcd66908e6eee35d8b719affe8