Remove commented out develpment code that is no longer used