BUG-509: remove unused code

Removes unused code, writen -> written, adds a FIXME

Change-Id: Id0795edc23f2aef6f73e42d54be877003daf4244
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-509: remove unused code"