TOo Much cleanup