Deleted a class and updated the UI, needs cleaning up