Remove some temp methods. Clean the code.