Using functions from /source
Clean up old code