REMOVAL OF TEST CODE