Removed unused code and table cells