commenting out bunch of code that no longer works