secured signals added, autowire properties removed, cleanup