Updated based on Mojarra 2.2.0-m13
Delete files no longer in use.