Getting rid of Max stuff