Supposedly last cleanup fix