Design clean-up, deleting unnecessary functions and links