Removed hardcoded paths etc