more clean up to unneeeded code