Delete unnescessary table heading link plus do some minor refactoring