Removed testing functions