Merge "remove class - APSApplication"