fair enough, calling it quits for today.
removed a whole bunch of superfluous imports, attempted to fix mop, but euhm, pretty much didn't fix it.

Signed-off-by: Pepijn Kokke <pepijn.kokke@gmail.com>