Remove commented-out code
Use app accessor consistently
Clean up specs a bit