Removed apache as a submodule so we can fix bugs