remove hardcoded paths in favour of defined paths