Some minor debug symbols removed
Cleaned up the binary classes