cleanup, less unnecessary requests