Clean up GimmickParser