[FXOS-135] cleanup unused code (Shortcuts, some TODOs)