Removed Boost dependencies