Copied gonzalo's changes from ctools-mobile project
cleanup