Remove no longer needed methods and variables