Removed testing code for merge with testing branch