Removed troubleshooting code, reverted back to working base