Removed testing, cleaned imports