Improving module removal