cleanup and less knockout