Removed unused code and replaced checkmarks with simple_check