Code cleanup
V24