even more cleanupu