Removed places not beeing commented