remove unused class
remove unused definitions

I believe that Option type may be used in the nearfuture