first phase - clean up

Signed-off-by: Randell Quitain <cprjk.buzz@gmail.com>