Clean up older code