[NoTicket] Bugfixes galore

and lots of deletions