* some cleanup done