Clean Up, Fix Deprecation, Fix insertion Pipe ClassCastException
Clean Up