Rajaprasong cleanup