Remove unused code

Headers were referenced but objects never instantiated