removed unused master-conf
added todo