Removed useless signals and commented lines