Removed testing code, cleanup