[ELY-87] Clean up unused bits