Removed extraneous customData and APPCID storage