Removed defunct code branches