Removing commented lines and obsolete brackets