Deleted unneeded classes and made another debug feature functional.