[Forum] Code cleanup