Clean the house and modify gaOptions parameters

Signed-off-by: Eduardo L. Francisco <eduardolf85@gmail.com>