removed temporary code to clean everything up