Removed helper methods for testing