Remove Samsung Debug stuff
Add missing janice ifdef