More WP build stuff.
More preparation for WP build, and removing feature that wasn't really good.