Cleaned up debugging mess