Removed debug code
Source tidy