Channels controller cleanup