Wall empty bug: some cleanup