Removed additional WP1 componetns