Removed comments/debugs