Clean up code after last major update