comments, small fixes, remove uneeded code