removed commented sections that were there for dev'ing