Cleaned up the load paths