removed comments and debugs