Removed some changes left over from debugging