Remove unnecessary tweaking code