Solve class signal inheritance problem
Kill some obsolete TODO