Removed a bunch of stuff I added for abe