Removing unused / test code