Cleaned up code (removed old commented out parts, mostly).

Untested since I don't have access to RFDuino's right now, but it
compiles and there isn't any reason this should break.