Removing boost dependency (yay!)