Removing some testing code temporarily