Removing/Fixing Deprecated Issues