Removed Debug codes