Flo: dispose of the crap

Change-Id: Ie83d2bbc42ed5b39d6c7bc9b4fdbaaf42ac3994d