Big cleanup! I removed all phase structure remainders from the code.