Removing some checks for testing