major clean up, dup code that already in init.rc