Deleted comment, some cleaning up