Remove some unused declarations in app