GCM
Code cleanup