Removed OWOOT and some general cleanup