oom: remove unnecessary code and cleanup