Comment out new effects handling... NPE