Removed dead/debugging code