Remove some unnecessary application code