remove needless code
encapsulate toplevel completion even more