Clean useless non-working things, fix bugs