Smiting enabled, some cleanup